auto merge of #974 : alexcrichton/cargo/issue-940, r=wycats
authorbors <bors@rust-lang.org>
Tue, 25 Nov 2014 17:44:19 +0000 (17:44 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Nov 2014 17:44:19 +0000 (17:44 +0000)
This key will support projects with nonstandard licenses and the registry will
display the license as "nonstandard".

Closes #940


Trivial merge